bitkeeper revision 1.15.2.2 (3e366d215hkWVtN4VomU_bD8cQZUxw)

domain_page.h, domain_page.c:
  Fix map_domain_mem() bug

diff --git a/xen-2.4.16/common/domain_page.c b/xen-2.4.16/common/domain_page.c
index 2e37b72c5cb86f7a4052c2084917b7e0f0ba66a6..927ba63ff13a9fcea3e2c21ac1c1c9c0669f867e 100644 (file)
--- a/xen-2.4.16/common/domain_page.c
+++ b/xen-2.4.16/common/domain_page.c
@@ -51,7 +51,7 @@ void *map_domain_mem(unsigned long pa)
         if ( cache[idx] == 0 ) break;
     }
 
-    cache[idx] = (pa & PAGE_MASK) | PAGE_HYPERVISOR;
+    cache[idx] = (pa & PAGE_MASK) | __PAGE_HYPERVISOR;
 
     local_irq_restore(flags);
 

diff --git a/xen-2.4.16/include/asm-i386/domain_page.h b/xen-2.4.16/include/asm-i386/domain_page.h
index bae558c377887e552c7a4b05c0c40f1157be7f78..92fb2611470008fd7137c6ab2f2472e6bf0e5f63 100644 (file)
--- a/xen-2.4.16/include/asm-i386/domain_page.h
+++ b/xen-2.4.16/include/asm-i386/domain_page.h
@@ -35,7 +35,7 @@ static inline void *map_domain_mem(unsigned long pa)
                         (pa & ~PAGE_MASK));
     if ( (*pent & PAGE_MASK) != (pfn << PAGE_SHIFT) )
     {
-        *pent = (pfn << PAGE_SHIFT) | PAGE_HYPERVISOR;
+        *pent = (pfn << PAGE_SHIFT) | __PAGE_HYPERVISOR;
         __flush_tlb_one(va);
     }
     return va;